Merge changes from topic "dmd_log_and_fix_rvc" into rvc-qpr-dev am: b72db4c52f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic87f4b68581208c48f3ee229adf978aeaee1d09e