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

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

Change-Id: Iee502e3c891c4df6ae061eac5ebe6821a00c7c82