Merge "Convert Calendar to androidx"
am: 284cf496ed

Change-Id: If391636753a32be605163d8d30ccb7ab5265de5d