tree d7a0c36813b83b5cbbdbee426c0584d8ac91fdc2
parent 81cd2036b1026fabfedb28ef4035a8aa53e6480b
parent 3f908c7afb48e0f6cfea515f65d8c85a5504916a
author Treehugger Robot <treehugger-gerrit@google.com> 1605700929 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1605700929 +0000

Merge "Revert "Revert "Added mitigation for b/122921367""" am: fcd2235d8a am: ad135159b4 am: 390cca1808 am: 3f908c7afb

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

Change-Id: I62fac79f1279c984d4762ffd75bdbebd4ca3542e