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

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



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