Merge "Update proto enum." into tm-dev am: 301a1081 am: 28096463 am: 782d870f am: 03ef9d9a

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



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