Merge "Update proto enum." into tm-dev am: 301a1081 am: 28096463

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



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