Android O MR1 IOT Release 1.0.13 (5612681)
Merge cherrypicks of [4709054] into oc-mr1-iot-release

Change-Id: If6d9ca7ac9c382ac8aadb3ca71dc24158b11080d