tree de90b46797447d4ac57ff2e4c58258275b8f302d
parent 535a59346a435bbbfe761c0b4e71f3d2553711b2
parent 3ebd91eb79785425bb3290f0571421ad16478741
author Iris Yang <irisykyang@google.com> 1542164053 -0800
committer android-build-merger <android-build-merger@google.com> 1542164053 -0800

[automerger skipped] Merge "Showing up network selection notification if out of service for a while." am: e3dc5e335c am: d20fd474e9
am: 3ebd91eb79  -s ours

Change-Id: I8c40d1f30dc1d4cc2be95fec01f2c432569a09d6