[automerger skipped] Merge "[DO NOT MERGE] Move onDrawn callback earlier" into...

[automerger skipped] Merge "[DO NOT MERGE] Move onDrawn callback earlier" into sc-v2-dev am: 6fea5163 am: 51051d6b -s ours am: 30735935 -s ours

am skip reason: subject contains skip directive

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



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