Merge changes from topic "am-3a1dc017c5454a58a13f145c3cc2068d"

* changes:
  [automerger skipped] Merge "DO NOT MERGE Dismiss keyguard when simpin auth'd and..." into rvc-dev am: 2b381768 am: cd993dd7 -s ours am: 4d4d843d -s ours am: df080e09 -s ours am: c3068ba5 -s ours am: ead918b2 -s ours am: 716bc14e -s ours am: f54e5f90 -s ours am: 26404c7c -s ours am: d3327b1f -s ours am: 7559e976 -s ours
  [automerger skipped] DO NOT MERGE Dismiss keyguard when simpin auth'd and... am: 09f00472 am: a4ff8bed -s ours am: a42e85b0 -s ours am: f2f6a0e5 -s ours am: 64091a4a -s ours am: c3e074a7 -s ours am: 33b915ab -s ours am: 0108ff97 -s ours am: 7f601788 -s ours am: c109d1cb -s ours am: 1ca23b36 -s ours