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

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

Change-Id: Ib2087b4e20b7b92c3c26ed9f8edb1c57555ce6e6