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

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

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



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