tree b76f4f0c9954193c2bbee75f30430759223dfa87
parent 89c3a47477dd7478417a5e83fa01af858096ce40
parent 94b6b080a6cd6fff26cb44483f219b641a6e3252
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1594695374 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1594695374 +0000

Merge changes from topic "am-b2651aafe3bb49dd82316c07117b552d" into rvc-qpr-dev-plus-aosp am: 94b6b080a6

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

Change-Id: I0558cc0c793af035fc9f3cd16a0d31c8c0cf4a00