tree a1a981f65c0ac1744f46c2f05f7777419127a86e
parent 6da429a4c4b5cc8ce9301eae43f69aeb70a4f4eb
parent 5cc9ace295921560e6dd2183472d2347f68509f8
author Xin Li <delphij@google.com> 1574581597 -0800
committer android-build-merger <android-build-merger@google.com> 1574581597 -0800

[automerger skipped] Merge QQ1A.191205.011 into stage-aosp-master
am: 5cc9ace295 -s ours
am skip reason: change_id I482ace6717063630d3c5018c471601cfd21a2f19 with SHA1 8b406b8d31 is in history

Change-Id: I63d07af6fdf44bf3f24b576f72de13c4e71841c8