Merge "Merge "Add Hexagon and Flower to R dogfood devices" into rvc-dev am:...
Merge "Merge "Add Hexagon and Flower to R dogfood devices" into rvc-dev am: 080431ef am: 1c8e67e4" into rvc-d1-dev-plus-aosp am: 338f8103
Change-Id: Ifcf038c292f0748c049521db2484dab7b9281156