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

Change-Id: I209cc1af736d5199a272e43554693e564c5609de