Merge "Merge "Add `value_` prefix" into udc-dev am: 6e4c58a2 am: a8234e67" into udc-d1-dev-plus-aosp am: d5b69b12 am: 4a512d04

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



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