DO NOT MERGE Fix broken test am: c8daad6962 am: c95406fce1

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12154028

Change-Id: I3c3080a5ed4807fa80ffb527facb3b88cf8addda