Merge "Adding aidl file to share deviceProductInfo constants bw java and c++" into sc-dev