tree 17a1472abfcb915fbb6db29362819f628d15b338
parent 691037240290af8e31ff3e28377a203aa6d96fea
parent f170953343ebb89e8128e8ddb4e98f20bafad8eb
author TreeHugger Robot <treehugger-gerrit@google.com> 1592550608 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1592550608 +0000

[automerger skipped] Merge changes I2292c1cb,I8f60c137 into rvc-dev am: aee09af636 -s ours am: b207e9c9de -s ours am: f170953343 -s ours

am skip reason: Change-Id I2292c1cbff06a304f70191b88d833b19af2b8b92 with SHA-1 00ea6cecd8 is in history

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

Change-Id: I4e7337e71480319a7dab68d89d8ada1e633cc0e5