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

Change-Id: I407b42d45738599955bca210b5f9896753e51224