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

* changes:
  Merge changes from topic "am-5d57157be386470dbb6228d78b40013a" into udc-d1-dev-plus-aosp am: 59802d6b -s ours
  [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 am: 05e26489 -s ours