[automerger skipped] Merge "Conditionally block battery percantage from search" into pi-dev am: ea97a66383
am: 76acf317a5 -s ours
Change-Id: I037b7f21c32474a769d4e870664b3e6d812148f3
This commit is contained in: