Merge "PMS write settings on shutdown regardless of pending type" into tm-dev am: 47c493ab

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



Change-Id: I23f35b66977577886a2eb8f253c1876e8a6c2117
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>