Merge "Use existing uid state/capability/widget visibility as default" into...

Merge "Use existing uid state/capability/widget visibility as default" into udc-dev am: d22cb8f2 am: 28c6e9be

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



Change-Id: Ibea3e869d720daa5a19bf32d3d04558695ebba06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>