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

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

Change-Id: Ide0fe1034053ab600f8a0ce0d827a3079b86d68d