Merge "Modifies Self-Managed CS binding detection" into oreo-cts-dev
am: ad51be6e44

Change-Id: I61337a1ecd6a9f03feb8d9369fc691941e06dd5f