[automerger skipped] Merge "Remove search option in Magnification settings" into pi-dev am: f9b93310c5
am: ecd3b2da54  -s ours

Change-Id: I99a647a6f5b29093ce64be9c19622a3bde10a359