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

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

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