[automerger skipped] Improve dump detail am: 7bdcb188b2 am: 7bfb37719d am: 84ae45ccec -s ours

am skip reason: skip tag Change-Id I8f13a0d8fe54e9bf8948e9576e9705024fe79611 with SHA-1 1ce20d65e0 is already in history

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

Change-Id: I2bbc9b5941f2f3e69f75c1723a29437b09d986ab