Merge "Add more data to removal history in alarm dump" into udc-dev am: c0138451 am: f6db885c

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



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