[automerger skipped] Merge "Add setProcessHidlReturnRestriction." into stage-aosp-master
am: 9edc02dce6 -s ours
am skip reason: change_id I0d340c31e392bfb86a188dab902e6d20fa836814 with SHA1 95df65646f is in history

Change-Id: Ica83e9325bad8e072bf7d9ed523a1fe3fa657a6d