tree a04619a1fbc7bcfe3c2057b985e6a59ca2514318
parent 274060725662dda9a261f5a24ef4f51247bb7fce
parent eac3b7061ce52284eae99357975bce8cb3e4ecb3
author Da Xing <qiyueliuhuo813@gmail.com> 1572893320 -0800
committer android-build-merger <android-build-merger@google.com> 1572893320 -0800

[automerger skipped] Merge "Crash app on foreground service notification error." into qt-qpr1-dev
am: eac3b7061c -s ours
am skip reason: change_id I36ea0137ca6978ff401f64dccacb6f2edcadd7db with SHA1 5df725a983 is in history

Change-Id: Ibadd3561473bbd7a890b47d51263903470b1e66b