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

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

Change-Id: I8805bfaa4ff1d0885afeb8c5918b82dc08eb4308