Merge "Merge "Update visibility of a constant for testing" am: 7370ba4f am:...

Merge "Merge "Update visibility of a constant for testing" am: 7370ba4f am: c9ff47be am: 00ef27d4" into udc-dev am: 1ec46561

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



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