Merge "Fix typo in HAS_CURENT_PERMISSIONS_REQUEST_KEY" into main am: ee40404d52 am: c1cdd89dd8

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

Change-Id: I92d22a1f317344544880184a866608a44c4a5295
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>