Merge "Revert "Revert "Revert "Revert "Add APIs that allow to exclude r..."" am: bc8f256721 am: 8c3fa67bbd am: 3dafac7b7c

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

Change-Id: Ie87d82fb28e48aa8a7ed7c0dcad669ddffd4097e