[automerger skipped] Merge "Include the history tag string in checkin file...

[automerger skipped] Merge "Include the history tag string in checkin file verbatim" into udc-qpr-dev am: 007e73d0 am: 2ee9667d -s ours

am skip reason: Merged-In I68cf65dd5285864bbf38115321da944d95c7438d with SHA-1 49fa85a1 is already in history

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



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