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

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



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