Merge "Fix all runtime permissions being considered changing protection from...

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

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

Change-Id: If02ade27e09ac13cc405db5f227f44526eca6454