Merge "Add vertical type check to prevent non-Automotive Androids from force displaying system bars."