Merge "Store package restriction settings at shutdown" am: 888c45b484
am: f67b9f6dc0

Change-Id: I76f262397ea45c786ca489484e9877df7a757392