[automerger skipped] Merge "Use requestType, not service type for interrogation check" am: be49b65d15
am: 25b4f72d3a -s ours
am skip reason: change_id Ib0cf44f58f02125ee0e4dc52e4073cd87d55ce52 with SHA1 02c6fcfc5f is in history

Change-Id: I248edf8be324af0ed9d7cc7f56b1ae2fda15616a