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

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

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