tree 27b51dbe6a75c14b37db53b2f09aaf66730b6c5c
parent 000700590a1c14e3dba970cca7ae36c4cd1605a4
parent 60f3ab275ef3ddf3afcdfdce4eb09b59024fec51
author Chavi Weingarten <chaviw@google.com> 1607545316 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1607545316 +0000

resolve merge conflicts of cae2ee036040fc0dce9fc82af9bf8d85240d566b to rvc-dev am: 60f3ab275e

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I065dc674678b9218920def3e7b347a1580fbd7de