[automerger skipped] Merge "Implement the method for time short string" into...

[automerger skipped] Merge "Implement the method for time short string" into 24D1-dev am: 4da9a6a9 -s ours

am skip reason: Merged-In I52788abd4f09bb32259b00f915dbe704ac0442af with SHA-1 71628170 is already in history

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



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