Merge \"Merge \\\"docs: Updates for picture-in-picture docs for N DP4\\\" into...
Merge \"Merge \\\"docs: Updates for picture-in-picture docs for N DP4\\\" into nyc-dev am: 22dec763 am: d0523602\" into nyc-mr1-dev-plus-aosp
am: 5f3c8684
Change-Id: Iffd476cbc5aa0e245b5469516406a99f16e28450