Merge "Add watch specific resource file for listviewfixed_layout" into oreo-cts-dev
am: 5f5567f95d

Change-Id: I0a856ddcb2ec71170dca71e831e0bd5aadb9226b