[automerger skipped] Merge changes from topic "dmd_log_and_fix_rvc" into...

[automerger skipped] Merge changes from topic "dmd_log_and_fix_rvc" into rvc-qpr-dev am: b72db4c5 am: 6564036d -s ours am: f801d4f9 -s ours am: fd1cd8c0 -s ours

am skip reason: Change-Id Idcfcbfa9e41bb9a34e4808db6fdd7f8a5901457b with SHA-1 a1324f30 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iba68f1f3c88721d3ab8d68de7e67fcbc9807c814