Merge "Ensure ordering of overlay callbacks" into tm-qpr-dev am: ced571cb...

Merge "Ensure ordering of overlay callbacks" into tm-qpr-dev am: ced571cb am: 01c5206e am: a26ae261 am: e8fe77c4

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



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