am 1d31b32a: (-s ours) am 6b2a5dec: (-s ours) Merge "Revert "DO NOT MERGE ANYWHERE. update support library to 22.2.1 from build id 2022988."" into cw-d-mr1-dev

* commit '1d31b32a03093f3781ca5aadac6d69bdd7c3d0b8':
  Revert "DO NOT MERGE ANYWHERE. update support library to 22.2.1 from build id 2022988."