[automerger skipped] Merge changes from topic "rs-deprecation" am: 67485cf9 am: 9b5047f6 am: 33be8eec -s ours

am skip reason: skip tag Change-Id I50b7ce18841eb38f2e5d986307afd91791efdf7b with SHA-1 efbe8ac6 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1683499

Change-Id: I142fc8fb529cc2c0d656dac2d2d54c51545a1aa0