Merge "Remove frameworks/base/apex/appsearch and associated tests" into stage-aosp-master