Android O MR1 IOT Release Smart Display r22 (OIMG.191202.005)
Merge pie-platform-release to aosp-master - DO NOT MERGE

Change-Id: I3dfa0d5353e23806c4f4ed9ee574fd0f24114f64