Merge "RESTRICT AUTOMERGE Fix alternateBouncer => primaryBouncer flicker" into tm-qpr-dev am: be8ecd7e29
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21941315 Change-Id: Idc2a3975344d3b8ca1b964528efd5a6c9f58624c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: