tree b017c823f43b5056158528c38407004b31582aa7
parent 811909c34664a4b27d930e301699768c5558097f
parent 7cbf4fee660c9c1f742228850ecd8ae2133c3e80
author Xin Li <delphij@google.com> 1574581610 -0800
committer android-build-merger <android-build-merger@google.com> 1574581610 -0800

[automerger skipped] Merge QQ1A.191205.011 into stage-aosp-master
am: 7cbf4fee66 -s ours
am skip reason: change_id Iadc2d9ce6a4d22c9575c2d7ae36ca68e45d2b5bc with SHA1 68dc999701 is in history

Change-Id: I75e211d0d74d4945fa94d025425f5870101fa106