Merge changes from topic "cf-pixel-perfect-matching" into tm-qpr-dev am: 692d4e65 am: fc528523

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



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