[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 am: f967c3b3

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



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