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

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

Change-Id: Ia8bd8ac866b02e33720e5ff9977eee452edca2d5