Merge changes from topic "reader-config-enum" into udc-dev am: 0dd3ca0c am: aef4f16f

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



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