Merge "change the format" am: cac091cedb am: 1d863c4a76 am: a2a73957bf am: d1e2293394

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

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