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

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

Change-Id: I1668d9179e5212a8b4632d3e753e0d7ae1d9c8a2