[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 skip reason: Change-Id I0665be5d585f64f3d43d42201a6529fd88247ca4 with SHA-1 e0ae1afd51 is in history

Change-Id: Ia06d98f7828808a72e4104c31bd13530b95ace5a