Merge changes from topic "am-1080747de55546f48b54c2873351ac7a" into tm-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "DO NOT MERGE Crash invalid FGS notifications" into qt-dev am: e7da6dd2 am: 496cbf10 -s ours am: d5d87d85 -s ours am: dc535c71 -s ours am: b21a0dae -s ours am: a530957f -s ours am: 9aa6451d -s ours am: 44ca4401 -s ours am: 60a5d22d -s ours
  [automerger skipped] DO NOT MERGE Crash invalid FGS notifications am: b6b2906e am: bf6983a9 -s ours am: cec8c138 -s ours am: c822f7cd -s ours am: 86064a52 -s ours am: 3b9944fc -s ours am: 4b13e950 -s ours am: 1e92793e -s ours am: 885a5c8d -s ours