Android O MR1 IOT Release Smart Display r39 (OIMJ.201212.001)
Manually merge changes from giant AOSP topic

Change-Id: I0808da42d7c2bfc4b81d1ece18a34f7605ca5f79
tree: 4b825dc642cb6eb9a060e54bf8d69288fbee4904

This tree is empty.