Android O MR1 IOT Release Smart Display r40.1J (OIMK.211005.001)
Merge pi-dr1-dev to aosp-master

Change-Id: Id4b9de2960dcde3b4f5568661eb003d4bbaded9f