[automerger skipped] Merge "Move setHasTopUi to the background" into...

[automerger skipped] Merge "Move setHasTopUi to the background" into udc-qpr-dev am: 3e4bbf4a am: cf75675a -s ours

am skip reason: Merged-In Ib29c49e5dca9f33e755be4f2a38deacaa1d344e3 with SHA-1 52fc18ad is already in history

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



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