Merge "Enable lockscreen_custom_transit_clock for Droidfood" into udc-qpr-dev