tree 1248139cd0e6bb76957a1e7bad6177ee872c81f3
parent 780281be417612b761f5ba548ee816ef370c0eb2
parent bc381e5fc1e85257868c6d623b485ccdc737bf42
author Xiangyu/Malcolm Chen <refuhoo@google.com> 1561004906 -0700
committer android-build-merger <android-build-merger@google.com> 1561004906 -0700

[automerger skipped] Merge "Triggering notifications when dual CDMA SIM combinations are detected" am: be0d8fc39b am: 939aef288a -s ours
am: bc381e5fc1 -s ours
am skip reason: change_id I5caf39478dd0814aa1b2def801b1c3a107355682 with SHA1 034cb343a1 is in history

Change-Id: I8ea1edbbda9a5fc6d3b317fb2fd720f21185ca4a