Android 8.1.0 release 21
Merge cherrypicks of [3353959] into oc-m3-release

Change-Id: Icdebab1c6a4525c5c971d59560b8aa6cfef0c010