Merge "Fix logic inversion bug for "basicGrant"." into rvc-dev am: 9bec3e33ac am: 10d251b6e0

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

Change-Id: Ia0721ca72abff598d369942ff17c3467bd9aacd3