Merge "change the format" am: cac091ce am: 1d863c4a am: a2a73957 am:...

Merge "change the format" am: cac091ce am: 1d863c4a am: a2a73957 am: d1e22933 am: 32b0d92d

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



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