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

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



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