Merge "Remove duplicate definition of assistant screen type" into oc-dev
am: 3d900b3476

Change-Id: If234609eb02579a4cac4718e1670f374e3818593