Merge "Expose SignalStrength.CREATOR" am: b0546af594 am: 9ca0d16b2e

Change-Id: Ie785dcbdbe287ad6c4c7ecf94a2bb412bbce1408