Merge "Remove ContentStyleSupported, remove constant" into pi-car-dev
am: b6cff25e95

Change-Id: I4c9d2529a9583b0c83590739ce951cc3df634469