Patch rebase frameworks/base

Change-Id: Ib6e84fab0976f463719222b5533d09afb91f1d81