Merge \"Merge \\\"docs: Updates for picture-in-picture docs for N DP4\\\" into nyc-dev am: 22dec763a3 am: d05236024e\" into nyc-mr1-dev-plus-aosp
am: 5f3c868474

Change-Id: Iffd476cbc5aa0e245b5469516406a99f16e28450