Merge "Convert Calendar to androidx" am: 284cf496ed
am: 9f477e745e

Change-Id: Ie89dc6d93e56e9e432c23647871b11ba2918e319