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

Change-Id: If9ed9697cc042375abd3d77b1eb4020d2798f96c