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

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

Change-Id: Ib4d54fc2149f9a1289975c71ba2465a4702185b2