Merge "Change package name for merging to SettingsLibWidget" into tm-qpr-dev am: 1f2a3d9f37 am: c885ae3582

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

Change-Id: I36b437596155d9bb753b42f6a6495c67805d6c40
Signed-off-by: Automerger Merge Worker <[email protected]>