Don't track forked frameworks/base

Instead, cherry-pick the patch from gerrit.
frameworks/base is a fast moving repo and gets outdated very easily

Change-Id: Iaf35418f2622586033c22fd36b3e15617120b994