Merge "Fix all runtime permissions being considered changing protection from non-runtime on first boot." into sc-dev am: 2357d702 am: be06348f

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13938161

Change-Id: Icf8388a424be1310bc0ef28e53c3eb0e2abde2f7