Merge "Merge "DO NOT MERGE Fix security vulnerability in pre-O rild code. am: bb6567c...

Merge "Merge "DO NOT MERGE Fix security vulnerability in pre-O rild code. am: bb6567cbaf am: 57170e4964 am: 44fd51827a  -s ours am: 023b8082b7  -s ours am: 774711be8f am: 39840dc5e3  -s ours am: 3a546ebf0a am: 8ad718398a am: 472cfd25ea am: 2a86c777ef  -s ours am: b916a4067b am: 21e26b21ee am: 52858488cd am: bd35fe83b0 am: 915b6f46e3  -s ours am: 20df21ecc7 am: 9a469ee216" into oc-dr1-dev-plus-aosp am: f985cb6db8" into oc-mr1-dev-plus-aosp
am: 59e9d1ec5f  -s ours

Change-Id: I701a0b124aec61bb9a402f1096f07c77636f04b3