Merge "Specify two item limit for EXTRA_CHOOSER_TARGETS and EXTRA_INITIAL_INTENTS" am: 73ded9f9df

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

Change-Id: I17ca9c8d0bb5ecad604bd5d2de5cb901ca7aafbd