Merge "Correct mapping for "boot-after-ota" compilation reason" am: 6fe49fb663

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2174125

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