[automerger skipped] Merge "Added mitigation for b/122921367" am: 80c398b74c am: b9293d20d5
am: b8fb174ffa -s ours
am skip reason: change_id Id38a6ccabdcd0da02a53e76c47850e197016e781 with SHA1 eac7f4e15a is in history

Change-Id: I4542b392afd0b04e0923cf81c870419d549c810d