Merge "Replace deprecated atoms.proto file path" am: b718a437 am: 5591ee35...

Merge "Replace deprecated atoms.proto file path" am: b718a437 am: 5591ee35 am: 75aab429 am: a9a9d51d am: 0e3c9a1c

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2146967



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