Merge "Merge "testLightNavigationBar case fail in mdpi device" into oreo-mr1-cts-dev am: 4d244d3b24"
am: e9fcf141b9

Change-Id: Iffc34357ef2800ef26ebf0611727ea018dda8cac