Merge "Merge "Remove sys.usb.controller from property_contexts" into qt-r1-dev am: f829467fef am: a25556c125" into qt-qpr1-dev-plus-aosp
am: ce588c5155

Change-Id: Ie79acbc2a5e86d94463b8ef9c6df54cd5ddf1d2f