[automerger skipped] [DO NOT MERGE] Enable APP_SEARCH_IMPROVEMENTS flag. am: e0ae1afd51 -s ours am: f1ab2b2a9a -s ours

am skip reason: Change-Id I0665be5d585f64f3d43d42201a6529fd88247ca4 with SHA-1 6b6dbc3442 is in history

Change-Id: Ic5075d0e5ba3fc9f3ddeedf8972011adeec4ff2a