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: Iebe9e92fab54022f74aeef9a6e7e452df5f897ea