Merge "Merge "Force-clear nav bar flags when phone finishes booting." into rvc-dev am: b236787b am: 6fd0d10f" into rvc-d1-dev-plus-aosp