commit f3865e926404ceab28d51846f6efa82940e575ac
author Sunny Shao <sunnyshao@google.com> Thu Nov 14 21:57:12 2019 +0800
committer Sunny Shao <sunnyshao@google.com> Thu Nov 14 21:57:12 2019 +0800
tree 3cf3368b1403710feb30754712384b225e291aaa
parent 2b7c8937decfd32156f38c603edc7524c14b88fb

Synced the code from master branch

Fixes: 144364245
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.deviceinfo.PhoneNumberPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.deviceinfo.simstatus.SimStatusDialogControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.network.telephony.RenameMobileNetworkDialogFragmentTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.homepage.contextualcards.deviceinfo.DeviceInfoSliceTest
Change-Id: Ibb26f5a63a969b28915a226a0197bc4033c91346
Merged-In: I5dfb71ceb87a8f658ef7fbceacf460ef8d35593a