Merge changes from topic "am-42d1762e687c49c89c6d20bcaa52e270" into udc-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Update config according to insets of status bar" into tm-qpr-dev am: 1dc53459 -s ours am: 5b8c6bab -s ours am: 58ba1742 -s ours am: 986036ca -s ours
  [automerger skipped] Update config according to insets of status bar am: 49454743 -s ours am: 79cc4e78 -s ours am: f3e1f5af -s ours am: 2a16e09d -s ours