[automerger skipped] Merge "Frameworks: Remove complex boolean" am: 16eef1aad8  -s ours
am: c997d66018  -s ours

Change-Id: Ic3087510597891dfa5c4fe09573f2de3c8391947