tree 8b331662115b8dec2cd24e67d55f9757395c5a17
parent 8c09b9d7e51493d2c24987969b03eaee58b35c36
parent 9e27e114af071cd5ffdc5d995015220d6d19778c
author Xin Li <delphij@google.com> 1606969531 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1606969531 +0000

[automerger skipped] Merge "Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855" into stage-aosp-master am: 9e27e114af -s ours

am skip reason: Change-Id I78222391b83a4add8e964340ec08bb8a1306e1c6 with SHA-1 07ec9b4dcb is in history

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

Change-Id: I72cd2486ff8473dcbdef76bc855e4fe45927b943