Merge aef74575 ("Merge tag 'for-linus' of...

Merge aef74575 ("Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux") into android-mainline am: beb2c75e

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



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