Merge "Remove some unused %% strings from frameworks/base." into lmp-mr1-dev