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: 738fa9f7

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



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