Merge e9e668cd ("Merge tag 'arm64-fixes' of...

Merge e9e668cd ("Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux") into android-mainline am: e1fe5aad

Original change: https://android-review.googlesource.com/c/kernel/common/+/3685152



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