Merge "Specify two item limit for EXTRA_CHOOSER_TARGETS and EXTRA_INITIAL_INTENTS" am: 73ded9f9df am: b5f0629d41 am: 379347b29a am: 9001310c40

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

Change-Id: I404a2ef9bdabcd5dba6529b4ca6f4b3463e31197