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
2020-06-30 00:05:14 +00:00
committed by Android (Google) Code Review

Diff Content Not Available