Merge "Change quick setting min_num_tiles number and text to resources value." into qt-dev
am: bc058faaa3

Change-Id: Ic9a8d19e633043b0179a53e8df8697c78712caab