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

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



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