tree a19de5e5ee9a92839bf78209b0d3abc001f9092c
parent 9e5913cf748f42119b9b85bbdc0ffade36d3fb91
parent e303dd658d24259a8ac25a59f9e2db11e177e99b
author Xin Li <delphij@google.com> 1595579178 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1595579178 +0000

Merge "Merge stage-aosp-rvc-ts-dev into rvc-dev" into rvc-dev am: e303dd658d

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

Change-Id: Ic9b609b6504a8a6921d39f0955a6eaa93cfd8429