Merge "Correct mapping for "boot-after-ota" compilation reason" am: 6fe49fb6 am: 03256f55

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



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