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 am: fba46092

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



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