Merge "Call onDrawn on main thread to delay the callback" into tm-qpr-dev am: 043714104a am: d9a5e7511f

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

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