[automerger skipped] Merge "Handle alwaysOnTop in DisplayAreas." into tm-qpr-dev am: 15a8232e38 am: 997ef74708 -s ours
am skip reason: Merged-In I683e3c6bdf1bb6a590829a197f5dbef2c171d7e9 with SHA-1 335c26296b is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19519704
Change-Id: I96bc937ad2d1ba706763d3fe11eab7e5c833e559
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: