Merge changes from topic "rs-deprecation" am: 67485cf930

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

Change-Id: I800ecc51dfd2c9972f5ab23938df4eb6f2a4c3f0