Merge "Update DecorContext's Resource cache when calling getResources." into pi-dev
am: 33cb3b7204

Change-Id: I1b7c21f87a196bfe834e00b523d6115400438bc7