Merge "Shorten month on AOD date" into rvc-d1-dev am: 0340d8ed50 am: 65be8ef9e0

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

Change-Id: Ia004fd46bb4e5e76c3b6c9a154c94efda06fac56