Merge "Update proto enum." into tm-dev am: 301a1081 am: 08534fd7 am: debebbac am: 69931ec1

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



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