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

Change-Id: If794d46074f6e09e65717a90a4b4084d4b26cc12