Merge "[automerger skipped] Merge "RESTRICT AUTOMERGE Ensure InputMessage is sanitized" into oreo-cts-dev am: d50d78acd5 -s ours
am: 962aa8286c -s ours
am skip reason: subject contains skip directive

Change-Id: I6d7c3909c3b5303473c037e5184854353c023f8a