Merge "Merge "Fix RTL in QS Header Info" into qt-dev am: 769dd9f0e3 am: a8e40d3783" into qt-r1-dev-plus-aosp
am: af8ee37158

Change-Id: Id404af66b4a7c0f346f7498644d2970c56b2c578