Merge changes from topic "am-5d57157be386470dbb6228d78b40013a" into udc-d1-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: 3b323b44 -s ours
  [automerger skipped] Update config according to insets of status bar am: 49454743 -s ours am: 79cc4e78 -s ours am: fb467f3d -s ours