[automerger skipped] Merge "[NetworkPreferenceApp] Initial skeleton" am: 94e3f4ba8f am: e5473840c5 am: 7f846117b1 -s ours

am skip reason: Change-Id Ibb3a39bbe3d881a94b80411f324a7b4b0e37f9c3 with SHA-1 118f8b9d52 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iacd2a71ff915c5d9f361e33b13d7390c2ae45eb1