Merge "Add tile information to ACTION_QS_TILE_PREFERENCES intent" am: ff1d8da55e am: 74a8b6543f
am: a8e10e5f20

Change-Id: I1585be50ecf4409f552b5ef5c91de1092a01e199