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 '6b2a5dec4f57c57091a229f06a4940772ce504a4':
  Revert "DO NOT MERGE ANYWHERE. update support library to 22.2.1 from build id 2022988."