tree 22d8c721d0eaf06768f6b652cbaf94226dede1e5
parent cad97e11d599291a9144748f6da2bee15722d7ff
parent 29bed111407484a394b03abdedd24085ad16fe07
author Treehugger Robot <treehugger-gerrit@google.com> 1603958780 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1603958780 +0000

Merge changes from topic "bug_167962976_visibility" am: 39c6068cbc am: 5942721506 am: 29bed11140

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

Change-Id: I823c257bfdb8ef2656f49ddfa697bedbd3abc8c9