Merge changes from topic "am-096d4608db2449ab836588334ba538ee" into tm-d1-dev-plus-aosp

* changes:
  [automerger skipped] Merge changes from topic "am-fb609f1bb3354ce28c51afe7d2a1c748" into tm-dev am: 90d93348 -s ours am: c3e7372e -s ours
  [automerger skipped] Merge "DO NOT MERGE Suppress notifications when device enter lockdown" into rvc-dev am: 4228c9bd -s ours am: a78e5a9d -s ours am: 5027b027 -s ours am: fed5af4b -s ours am: 86ef01d9 -s ours am: ca2dc058 -s ours