Merge "Merge "Revert "Add the settings content observer for shortcut preference."" into rvc-dev am: 9ae5b47aee am: b726331702 am: 51b2b3d876" into rvc-qpr-dev-plus-aosp

This commit is contained in:
Automerger Merge Worker
2020-05-13 06:00:33 +00:00
committed by Android (Google) Code Review

Diff Content Not Available