[automerger skipped] Merge android10-qpr2-s3-release kernel to aosp/master - DO NOT MERGE am: 31e8f0f967 -s ours

am skip reason: Change-Id I3f472c50b7d4c584b8766e1f21804fbe05ab9582 with SHA-1 ae5715e8a2 is in history

Change-Id: Icc529156be1dfbfcc0cdd6e876cadc9ae6e951f3