tree a99cffb452e25d1bec04fb333579b1a3f065b021
parent 082832d91d8ed940b24c7fe85bb4d6f7f66a7672
parent 338022f3f78fc4ecb4f1f680bd5ca1e969821809
author Chavi Weingarten <chaviw@google.com> 1607546395 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1607546395 +0000

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iada6af56ba8b1676513ff0804f576b84be022d06