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

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



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