Merge "Merge "Remove incorrect isAppUid check reading memory state" into rvc-dev am: d4905785 am: cb9aae0c" into rvc-d1-dev-plus-aosp am: b0ad9e1d am: 6d90a7b1

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

Change-Id: I8bae3681e37814b9e57787f1b48d2fad23262e39