Merge changes from topics "TransientRowLogs-udc-qpr-dev",...

Merge changes from topics "TransientRowLogs-udc-qpr-dev", "cherrypicker-L28500000961468539:N81900001381124144" into udc-qpr-dev am: c4ca3049

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



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