Merge "Fix cts failure about automotive navigationBar" into oreo-mr1-cts-dev