[automerger skipped] Merge "DO NOT MERGE: Fix a condition that detects existence of navbar." into oreo-mr1-cts-dev
am: 7aed30332d  -s ours

Change-Id: I45ab33eb47d3ad256820ed48b56ce5252c115360