Merge "Merge "Fix crash when trying to open app info page" into rvc-dev am: a43e978ffb am: 514dcef9df" into rvc-d1-dev-plus-aosp am: 94b4fc809e am: 2741969bbe

Change-Id: Ica4ee1e6df73432a829c4cb976f4d008b523f9da