Merge "Use separate Settings.Secure entry for the new LPH settings page." into udc-qpr-dev am: 80fd0acb6b

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

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