[automerger skipped] [automerge] Fix StatusBar test 2p: 68afc54a39 am: 31d394cb0e -s ours

am skip reason: Merged-In If5ce110b506b6b4229dd6ea5a39542369742bc51 with SHA-1 79f9dd01e0 is already in history

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

Change-Id: I8faf04ff3f9f96713113528e10ae3d6be286069c