Merge "Add NONE for LceService" into oreo-vts-dev
am: dfa79a6292

Change-Id: I53cd38ba31b1f19860f7d67396a1ce130c4a3375