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

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

Change-Id: Ie70c2e45055fbc85d083c94f510e6c223ac8dcf1