Merge "[3/n] Move new picker logic to AOSP" into sc-dev