Merge "Correct the PropertyInvalidatedCache module definition" into tm-dev am: 9331216c am: 0ea5839b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17049659

Change-Id: I72873114791db97f0d786ac9b542ba54b79eff0c