Fix to make quick settings tests more robust Test: Verified passing locally Bug: 37465082 am: 75267e1b am: 2a300ae1 Change-Id: I971efbd364d70dac4c76ab4c45997be7fdffbe4f