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

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

Change-Id: Ib87addd87ac3cbafe92f83b6d468c7ea322432fb