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

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

Change-Id: I52eff7abb30ba8e67838b4eec530f189bf91d84e