[conflict] Merge "Replace deprecated atoms.proto file path" am: ca39b91f am:...

[conflict] Merge "Replace deprecated atoms.proto file path" am: ca39b91f am: 7c90c68f am: eb969394 am: 6a110951

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



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