[automerger skipped] Merge "Cache PM data in DPGP" into rvc-dev am: 371634f4...
[automerger skipped] Merge "Cache PM data in DPGP" into rvc-dev am: 371634f4 am: 421cc73c am: 9a2eee3f am: 51508000 -s ours
am skip reason: Change-Id If77214a193a39fec2f311a3aea324ef07c2dfb42 with SHA-1 be11ab63 is in history
Change-Id: I89a2505ef02b06aaa90f5f274b5bafff6a6c4b3b