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

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

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



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