Merge "[automerger skipped] Merge "Update SysUI to be compatible with latest...
Merge "[automerger skipped] Merge "Update SysUI to be compatible with latest Jetpack libraries" into tm-dev am: 8a86bf91 am: af930c78 am: 932170fd -s ours" into tm-qpr-dev-plus-aosp