Merge "Allowing SurfaceViewHost to show up in layout inspector" into tm-dev am: 579f8a62

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



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