Merge "Revert "Adding aidl file to share deviceProductInfo constants bw..."" into sc-dev