Merge "Enable common logic for proto 1 and proto 2" into tm-qpr-dev am: 4613b0f0 am: e4f6f176

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



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