Merge "Code cleanup and visual polish for hybrid views" into tm-qpr-dev am: 12f23952

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



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