Merge "[automerger skipped] [DO NOT MERGE] Initiailize APP_SEARCH_IMRPOVEMENT flag outside DEBUG builds. am: 1ff2be0dce -s ours am: 96e88222aa am: c9f57a8f85" into rvc-d1-dev-plus-aosp am: 180c539ef2

Change-Id: I95266585fcc1fc698d730330b37b4415ce2c12d5