Snap for 11637835 from bcfbe3a5fc572ea731c08053d83160e677c877da to androidx-main-release

Change-Id: I17f745c293e733b1cfb9c4307c69d30f729697e0
tree: 440964a0f41a6e3d69f5c1b67f733816e6ca6583
  1. android-34/