Merge "Add meta-data denoting that a patch 25239169 is present." into udc-dev am: ec36d3e3 am: df716fc4

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



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