tree d5bc8a2afd365a0d9e62d56af4ef76b48d831652
parent 7a2473159d42d909d47a14bededfb2c317a180a2
parent c04b6004a323a9cc3d8b1a88c74ad8b9e7f1aefa
author Janis Danisevskis <jdanis@google.com> 1604351644 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1604351644 +0000

Merge changes I7c17ab51,I5bd4acb4,I93270f00 am: 18bbac10c1 am: 68acc834d4 am: c04b6004a3

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

Change-Id: I59184b7d4a01b1478599b53b6f7dd1fc3b3c5465