Merge "Fix overlapping FloatingViewType IntDef"
am: c73828fd96

Change-Id: I2b5f60a83ed1f07050f95f4c4240682f7ec480f6