Merge "Fix binder leakage and activity leakage in MobileNetworkSettings." am: ae6dac9126
am: d72edcb69a

Change-Id: Iaa83964117e51f5d19dfa37c9625526d2fd91b78