Merge "Merge "Fixes NPE with system shortcuts." into rvc-dev am: 6f5d4bb8ab am: fc49c2c54a" into rvc-d1-dev-plus-aosp

This commit is contained in:
Automerger Merge Worker authored and Android (Google) Code Review committed 2020-06-30 00:05:14 +00:00
commit 7264ed06b4

Diff Content Not Available