am a7a9327b: am 5474f085: am 9fc157a4: Merge "FLAG_PRIVILEGED disappears if privileged app is updated and rebooted"

* commit 'a7a9327be8b2b2ee2a461d1a0558c0c7b5b9271c':
  FLAG_PRIVILEGED disappears if privileged app is updated and rebooted