tree 4b56bf4057a098c2ecbb7228d611a650cd12b1bf
parent 5607deea5910294d12380ad53ef979c20e6d09a7
parent 9391dad80825fcd6e0d5d9f564d074645e7bbbbd
author Treehugger Robot <treehugger-gerrit@google.com> 1591727296 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1591727296 +0000

Merge "Address comment from aosp/1232197" am: 794e6ba285 am: a87d030207 am: d471a80425 am: 8d25751223 am: 9391dad808

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

Change-Id: Ib1c65c3f9880792b49813bb6871f0eb8f0dcb880