DO NOT MERGE Fix broken test am: c8daad6962

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

Change-Id: I3ffa5f34495c0a3ac818d41a45ac29936d6f1bc5