[automerger skipped] Migrate Messaging to androidx. am: 1b693ea7 am: 2310d698
am: a1413d3c -s ours
am skip reason: change_id I9103450622f129311545648ac75f5b2f9fc2d04a with SHA1 f38a1bdc is in history
Change-Id: Icd24f40abc4827f92f64e98e032eb954a3dcd8a2