tree fc8bed55fcdf53b5b1ecd615d1d772502d9d5df4
parent 0c1f0247d59f84815af7e0ed0598ad82748e12a9
parent e2a6e9a49a5000235f6739ac7a7f214ad71eceb6
author Aaron Huang <huangaaron@google.com> 1592477267 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1592477267 +0000

Merge "Address comments from aosp/1298476" am: 6dc9a28b88 am: e2a6e9a49a

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

Change-Id: I7b119758ac7cd65defdec77692957287af17566d