Merge "Update to positive logic to better match the method naming" am: 1c7bc039ea am: a7136c6340

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

Change-Id: I6e823ac8769864d9a1bfd6d675331d4b683da331