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

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



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