Merge "Add hidden constants to allow the role holder updater to specify the...

Merge "Add hidden constants to allow the role holder updater to specify the failure strategy" into tm-dev am: a3ca84f8 am: f5f646bf am: 43200e0d am: 32decca6

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



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