[automerger skipped] Merge "RESTRICT AUTOMERGE Ensure InputMessage is sanitized" into oreo-cts-dev am: d50d78acd5 -s ours
am: b0ea0d7322 -s ours
am skip reason: change_id I23d6b979c5ff13272626bb0610834fd1147cf645 with SHA1 fad8208051 is in history

Change-Id: I8c0d3a53efddda8650e180341b66fbd9d0aa3f4e