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

Merge "Update visibility of a constant for testing" am: 7370ba4f am: c9ff47be am: 00ef27d4 am: 61080fce am: 13f82c22

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



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