[automerger skipped] Merge "Fix binder leakage and activity leakage in MobileNetworkSettings." am: ae6dac9126 am: d72edcb69a
am: 0b72917dcf  -s ours

Change-Id: I4374c2470602b198f2eefb6c7a5b3a139268dcaf