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

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



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