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

Change-Id: I97ad69e56c6a3c32f9d530aed933b98a61d6daa4