Merge "Track priv_app firstboot_prop denial" am: 49bb11875a
am: 06f6472db0

Change-Id: I05f308db9989204cd5f962ac1759e85b77f6c9a3