Merge "Adding quick settings flag to sysui state am: 5b6a1fe8a8 am: 32ea8fbd5f" into qt-qpr1-dev-plus-aosp