Merge "Fix "No file_contexts" warning am: e35926e1af am: 3445b94c89" into oc-dr1-dev-plus-aosp
am: 2ea95442ed

Change-Id: I6ed6e51f75a28dc76977393b30c824a54b71553f