Api changed in aosp/2120177 Bug: 235727273 Test: TAP Change-Id: I1645dab6000dc760b4de2bb625e0af8df014c8c8