[automerger skipped] Merge "Enable expanding of status bar just below the...
[automerger skipped] Merge "Enable expanding of status bar just below the notch" into pi-dev am: c6c9a78b
am: f700a306 -s ours
Change-Id: I9d096903e7dcde04468242b39f59d53ce37d3e0b