Merge "Callback the surface package after the views are drawn locally" into rvc-dev am: cf5f65cbe3

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

Change-Id: Iebda003f603bcfc10184c106cccab39c0c490baf