[automerger skipped] Merge "Fix BP rotations with 3 button nav" into...

[automerger skipped] Merge "Fix BP rotations with 3 button nav" into udc-qpr-dev am: a1266468 am: 35815f3c -s ours

am skip reason: Merged-In Ifc426f7323870c67bf68cbf66a8ad48a125694b1 with SHA-1 84e025b2 is already in history

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



Change-Id: I3262243cb66d99930baaddc45c8f3241af0cbf10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>