[automerger skipped] Merge "Merge branch 'fetch_qt-qpr1-sysui-dev_5855545' into merge_qt-qpr1-sysui-dev_5855545" into qt-qpr1-dev-plus-aosp
am: 2c4d0db5e8 -s ours
am skip reason: change_id Ibc2bb3a04ee5605660ff4f2cf762af499db237c8 with SHA1 70ff3fb971 is in history

Change-Id: I79ed1e48ffaa5a714d8f7d93dedfe141aad14f18