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

am skip reason: subject contains skip directive

Change-Id: Ibc4347a0ce1b5307d162b06b27edf9449dc518fb