Merge "Fix ExtServices crash problem when getting shared preferences" into rvc-dev am: bbe5aa8eaf am: 9a175fde25

Change-Id: I93f60e8672ede5dbee2e6ebd9ce405bbdb677297