Merge changes from topic "am-fb609f1bb3354ce28c51afe7d2a1c748" into tm-dev

* changes:
  [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
  [automerger skipped] DO NOT MERGE Suppress notifications when device enter lockdown am: 2e1c70b6 -s ours am: 15810f60 -s ours am: 75843483 -s ours am: bc08139e -s ours