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

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

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